xend: Don't use -q flag to bootloader if activating text console.

In Xen 3.0.3 series release, if one did 'xm create -c someguest' then
you would be shown the pygrub boot menu, allowing one to pick a
kernel. If you didn't use the -c arg, then it'd just pick the default
kernel.

In Xen 3.0.5 testing, xm is forcing the addition of the '-q' flag
whenever the 'bootargs' parameter is not given in the config file. So
if one does not have 'bootargs' specified, and one uses 'xm create -c
someguest' you never get to see the pygrub boot menu.

This patch fixes 'xm create' so that it does not add the '-q' flag
to the bootloader args, if the '-c' flag is given to xm create. This
makes the default user experiance operate closer to user
expectations.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 5b4577c407bc0b6fef2708e81f0948b908f982ed..79fa947bb61a9d7a20d2241656f4fa518d01341b 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -777,8 +777,11 @@ def make_config(vals):
         config.append(['bootloader', vals.bootloader])
         if vals.bootargs:
             config.append(['bootloader_args', vals.bootargs])
-        else: 
-            config.append(['bootloader_args', '-q'])        
+        else:
+            if vals.console_autoconnect:
+                config.append(['bootloader_args', ''])
+            else:
+                config.append(['bootloader_args', '-q'])
     config.append(['image', config_image])
 
     config_devs = []